3eccdb5d256c90f6158c9a539374510f6f3815f9,clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusRESTBinding.java,WalrusRESTBinding,handleHttpChunk,#HttpChunk#,1128

Before Change


			buffer.readBytes( read );
			putQueue.put(WalrusDataMessage.DataMessage(read));
			if(httpChunk.isLast())
				putQueue.put(WalrusDataMessage.EOF());

		} catch (Exception ex) {
			LOG.error(ex, ex);

After Change


			buffer.readBytes( read );
			while(!putQueue.offer(WalrusDataMessage.DataMessage(read), 500, TimeUnit.MILLISECONDS));
			if(httpChunk.isLast()) {
				while(!putQueue.offer(WalrusDataMessage.EOF(), 1000, TimeUnit.MILLISECONDS));
			}
		} catch(NullPointerException ex) {
			//ignore NPEs (they are intentional if an exception has been thrown